Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 20 Apr 2011 06:27:19 +0000 (23:27 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 20 Apr 2011 06:27:19 +0000 (23:27 -0700)
commit14dc755ef1d14297e1cc2ff19d12441d64cb5b4c
treec29083d1b05ef68c17862e40fe60869d74958b77
parenta0423c3e9183a30eb5174d272c88fa4e827f3b06
parent7a2eba0a39f35e5ed4ed13e8f68b5cffdbafdc6d
Merge from mainline.